Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NOVA Core language files not loading #299

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix NOVA Core language files not loading #299

wants to merge 1 commit into from

Conversation

ExE-Boss
Copy link
Member

If a wrapper also defines a language file, then it will be ignored currently.

The Core and Wrapper language files should instead be merged, with the Wrapper language file contents following the Core language file contents, replacing Core lines where the Core and Wrapper language file key is equal.

To do list:

  • Make the build script merge Core and Wrapper language files.

Ex. the following files should be merged like so:

Core some.lang:

core.foo=Core Foo
core.bar=Core Bar
core.baz=Core Baz

Wrapper some.lang:

(placement of core.bar is irrelevant)

wrapper.foo=Wrapper Foo
wrapper.bar=Wrapper Bar
wrapper.baz=Wrapper Baz
core.bar=Replaced Bar

Merged some.lang:

core.foo=Core Foo
core.bar=Replaced Bar
core.baz=Core Baz

wrapper.foo=Wrapper Foo
wrapper.bar=Wrapper Bar
wrapper.baz=Wrapper Baz

@ExE-Boss
Fix NOVA Core language files not loading
e31e513 
  FIXME: If a wrapper also defines a language file, then it will
be ignored currently. The Core and Wrapper language files should
instead be merged, with the Wrapper language file contents following
the Core language file contents, replacing Core lines where the Core
and Wrapper language file key is equal.
@ExE-Boss ExE-Boss added bug Confirmed bugs help wanted Extra attention is needed in progress Pull requests that are not yet ready to be merged and issues that are being worked on. minecraft 1.7 Affects Minecraft 1.7.x wrappers minecraft 1.8 Affects Minecraft 1.8.x wrappers labels Apr 20, 2017
@ExE-Boss ExE-Boss added this to the v0.1.0 milestone Apr 20, 2017
@ExE-Boss ExE-Boss self-assigned this Apr 20, 2017
@ExE-Boss ExE-Boss requested a review from RX14 April 20, 2017 18:25
@codecov-io
Copy link

Codecov Report

Merging #299 into master will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #299   +/-   ##
=========================================
  Coverage     13.59%   13.59%           
  Complexity      732      732           
=========================================
  Files           409      409           
  Lines         12788    12788           
  Branches       1354     1354           
=========================================
  Hits           1739     1739           
  Misses        10932    10932           
  Partials        117      117
Impacted Files Coverage Δ Complexity Δ
...ore/wrapper/mc/forge/v17/launcher/ClientProxy.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...ore/wrapper/mc/forge/v18/launcher/ClientProxy.java 0% <0%> (ø) 0 <0> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9389e0a...e31e513. Read the comment docs.

@ExE-Boss ExE-Boss added the rebase needed 🚧 This PR needs to resolve a merge conflict label Jun 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RX14 RX14 Awaiting requested review from RX14

Assignees

@ExE-Boss ExE-Boss

Labels
bug Confirmed bugs help wanted Extra attention is needed in progress Pull requests that are not yet ready to be merged and issues that are being worked on. minecraft 1.7 Affects Minecraft 1.7.x wrappers minecraft 1.8 Affects Minecraft 1.8.x wrappers rebase needed 🚧 This PR needs to resolve a merge conflict
Projects
None yet
Milestone
v0.1.0
Development

Successfully merging this pull request may close these issues.
2 participants
@ExE-Boss @codecov-io